work-in-progress code reviewed with Ravi