Return to on demand engineering