merging all my changes from sprin 9 to current sprint