design changes
git conflict resolved