Added some updates based on feedback from HT