update to handle new point picking semantics