Improved single response mode
More improvements to single response