Updated all the files for Joe exclusively