Added Shanahanitization pieces I missed