Refactoring, for some reason there's a slowdown now