Gh9

Reviewed and approved. All comments fixed.