first changes for streamlining the design