Add code for platform report
fix bug found by Antonie