Fixed Spoilers

This is for you tim!