merged revisions for shaker~mojito