Some enhancements in Equalizer