More accurate (18/26)

More accurate