Minor changes to adapt new rules