Exercises 9 & 10 + fix for GIDs