More accurate (4/26)

More accurate