Raters, libs added
Merge conflict fixed