changed vectors into maps on data-major