cleaned up grid