lots of gobi changes to be merged