removed lab, fixed searchdirection
fixed merge conflicts