Updated to run on production