more gii improvements