ready for merge

almost nothing is changed, just trying to correct the merge of GHW