Gib improvements