completed modularization and combination of code for fast iteration