Beggining update to work with Blaze