Push 8/23

Assessment changes