Merged Gnz-Branch