new version with grid tests