Updated to code from production