Rejiggered some stuff