Updated model to have search, but still way 2 slow.