Timepicker upgrade

@gcapalbo