Changes for blaze