Partially converted to latest
Updated to latest gaffa