more updates based on feedback from Antoine Trux