more fixes
back to old rules