Some changes in design