More accurate (7/26)

More accurate