V3 refactor normalize