design - minor changes