Slight shuffling of Profiler calls (Profiler needs to be totally revisited)