Further improve it's speed