Updated rules and organized file with a behavior semantic