Changing some of the assignments and how they are rendered