Updated to match latest version of gaffa