Updated to new assignment