Some changed from David Sprinkle's Feedback