Tom made a second method.  Also fixed a couple of errors