Moved whoops and modified variables