update for Blaze; closes #22