ok, skip the abort, then this is ready to be merged