Awful but working changes. Captain Obvious, please help us!