I'd change n_row here too