changes from work computer commit GF