modify prep and build routine