Abort - addressing review feedback (to be squashed)