Per firework control

Merge