Adding our changes from club on 10/2