Classification is changed.

Also added a few ideas