Updated Grid handling.