Fixing this branch and setting people on fire