Getting it to work on production