Updated to follow rules and recommendations