Update to Aaron's latest settings