Reorganization and added raw data