Enhanced the break-and-resume mechanism