porting to work with latest ROSS/CODE version