Restructured report and did some measurement things