Better structure
Make an own class for AKF detector (tested for C2-B5)