Flame bomb

+ refactoring