Tagged beam-shaping