More accurate (6/26)

More accurate