updated order of rules a little