Adapt new structure for cob4-1 

Tested on cob4-1
see my comments above