I will consolidate this hidden dir logic.