Some changes to design