More accurate (5/26)

More accurate