Made grid even better