removed hack, looking into search