Some changes included