hopefully, added support for abort