Updated to handle resumes