RR fixed and improved