@bramwelt review changes