Design changes and fixed issue
Conflict resolved
conflict resolved