rules update and reformat
rules reformat again