Design changes

Improved the existing design