Split saveresume to reduce complexity