Gid improved twice