Updated to latest version from gaffa