TopicViewController edits by Shaun