multiple improvements. again. now you can run it with grid