merge in my additional notes with Gary's