Some changes after a Kevin-Test