updated gaffa, improved impelementation due to new gaffa features