Changed some things.. derp