Merging Durgesh's work

Responsiveness sucks!!!