Some changes whateva