Design changes
Merge conflict solved
Merge complete
Design improvements