Keyword: trail improvements