Some changes 18.10