Updated for new adventures