Working version.  Forgot to uncomment a line.