added spoilers