Flame function no longer creates the universe
Merged conflicts