Added quite extra parts for final report