Credit Andrew with minor configuration updates