Initial Commit-minor design changes