More accurate (22/26)

More accurate