align with Rishis changes in explorer2
combined file with Rishis changes