changes to fix reporting problems