Reworked discussions

by James