ADD: make.pre & make.post; make.extra removed