Some changes on new design