Rework after reviewing rubric