My tweaks, initial revision.