Changes from revised rules
Additional revised changes.