More accurate (14/26)

More accurate