Update to introduce abort - still not fully working