Changed some discussion subjects