doesnt run without immediately dying!
merged conflict fixed