Changed model defs
Naive nearest neighbor