revised grid mask logic