updating to meet current rules