lot of reorganization and new content