Code reorganization. Improved feedback.