Updated Grid impl.