With the mapping_factor replacement in place