working on changes on Yous branch
conflicts fixed