Added better handling of time and spacing.