Incorporate all feedback from Pierre de Buyl