GTH - code commit on 17 sept. re-structure