Made it a little bit faster even