LP1849212: Grid improvements