moves builder_tracker conditions above factory instantiation