Fixing merge conflicts
Adding prod mode back