Merged in local changes to reflect different assignment