Changes on design