Further work on time-spent component.