More porting of eroq