Syed - Design changes commit 2

Committing two uncommitted files because of internet interruption