Updates for Blaze/Using Slava's modifications