Add suggestions from Ingo