Incorporate feedback from Stephan.