added support for no-setup routine