Added in post-Apple changes to resume