fixed donalds mess
merge conflicts