reorganization
fix goof