more reorganization and writing