Some changes was made...