Minor Changes on design