FIXES after profiling code