John - added configuration and did some other stuff