More accurate (13/26)

More accurate