few changes and new package with RR