more changes to the design