adding time picker and new functionality