revision

revised for new changes caused by directory module