Review on Blaze PR

Blaze PR