Some changes, to see if they work