More changes from GD development