More accurate (10/26)

More accurate