Janes changes

I NEED my awesome code to be on master or my life will end