Added all of the changes we did in club on 10/2/2014