changed order of rules