The entire first period class agreed that yesterday's algebra homework which the teacher assigned was a really fun challenge. How should the writer revise the punctuation in the sentence so that it is grammatically correct?

"The entire first period class agreed that yesterday’s algebra homework which the teacher assigned was a really fun challenge." is the original sentence. It should be revised to:

The entire first-period class agreed that yesterday’s algebra homework, which the teacher assigned, was a really fun challenge.