Improved local search