I messed something up and am restoring some of Alex's original code.