Merge adventure (7/26)

Merge adventure