More auto tool stuff