Sake bomb changes

Resolves #1291