finished switch to combined state and time