updates from hack with olivier