Re-added firework join code to main