added some gii stuff