Some changes here and there in shared