Added abort flag