updating to current production code