Another minor changes in design