ref to discussion
Discussion fixes
merge