combined the two database trips for data rolling into 1