-- Some changes --