Merge adventure (11/26)

Merge adventure