Test/performance

Multiple performance improvements with grids