More accurate (21/26)

More accurate