minor changes of design