first merge from OORS