changed stuff over to new time input