updated for new autobuilder