Made changes according to new rules.