Goff extended four years