Continue work on search