added reporting
Revert "changed from customfacts to report"

This reverts commit e2a2131905c8ac7b1677b801a702a831ddb39dbc.
Revert "Revert "changed from customfacts to report""

This reverts commit f23cb762abd856e0474565b4135999670c1408c3.
fixed some logic