A bit of refactoring to make a better "optional" time argument;