GH-new changes

more changes