Still improving
More profiling