Re-writing discussion logic