Added abort functionality