Some changes have been applied