Major changes with separate RESUME functions.