first pass at blaze changes