Fix slow, add iknn sknn
merge