Some changes made