improved ordering of checks