only include completed services, and make collapsed time a function