More modularization and error feedback