Updated to allow for pre-selecting a time