Restore the old unsupervised path and add comments