Third batch of changes before senior show (not done)