dissagregated data almost ready + some more changes