More accurate (3/26)

More accurate