Changed globals to not be using my local settings