#PT-114  Grid logic was included