fixed anything for rubric & added transition