updated for autodescribe