Added some desgin changes