Improved the peformace a lot :D