Changed Grid implementation