A few changes made to make the code work on production