Updates (basically what was on CMS + RRT fix)

and some data