6th

Some minor changes for getting proper measure results.