More accurate (17/26)

More accurate