Changes to reflect assignment requirements