added smart movement and smart search