Better flow for rules

"change to something decent"