Changed some derp code