minor changes on design