shapes + DRC + norm fixed +