fix ANT
more or less works, need to implement search next