more changes on design