More accurate (12/26)

More accurate