Refinement of the first movement.

Also added DEGREE, but didn't apply it everywhere in the code.