Improvments to rating