Grid is now a bit faster