Change measurement strategy

- Better perf
- Ali's measurements