Integrating original histogram & various fixes