modularize - part2