discussion improvements
discussion improvements merge