do a better job w/ the time picker