some changes that make this work according to gib