Updated for Blaze