Fixing last commit
Muuuuch faster