Changed unsupervised
Some reorganization