fixed duplicates maybe, also added restful trips