Solved problem with performance, final source