Changes by Mike Emmel.