Should you update ` _cloneWithNewMap` below ?