Updated to GoodReporter 3

Updated code for GoodReporter 3