Make it a little bit faster