merged changes from altering assessment