Removing the ad-hoc offset, combined with your suggested change to `GridDataSource`, makes sense and gives results that still pass the tests. Thanks!