further hyde-z porting