updated to reflect new rubric