updated, compatible with the merged trail