minor changes for easier intermediate steps, lots of death