Update production to reflect current practice