Make it a bit faster