Updated to reflect production code