Ap handling revised