Add more controls and only scan relevant grid cells