Gaf 4 develop

updating fork