tidied up and changed search path th "search"