updated to work with my new server configuration