add time to 'When'. Close #6.