Big update...Missing R correctness