Minor tweaks, removed 2nd version.