Added firefly and boost system and such