Modify to return transit time as well