getting ready for merge
merge with alex finished
merge from alex
rating with stars added
fix merge