Modified code to allow for deployment on site