Updated autobuilder