Rearrange code
Bug in one sided probing fixed.