Got it working on production