Changes after meeting with Peter--must update further.