Changing things around and drastically improving speed