bab - add V2 detect with bug fix in detect