Design changes by Nilesh

Design