Updated to reflect current production