uncommenting helpers and grid to work better with Neat