continuing to modify search and approach states. needs tested