Reworked to use firework charges rather than records