Rework some old assignments