Moved to production with minor fixes