added updated refs
Merge branch 'refactor-forum'