changes to support grid testing