Profiler seems to work now
Merge branch 'profiler'