ROMP with couple improvements