We should add a comment for modifying this when applying this new feature.