partial changs to erbs
merge conflicts - semi resolved