small optmiziation
revamp wsearch