added noinst support