refactor + trips