Update the assignments to be easier to understand