More accurate (2/26)

More accurate