commented out echo() statements
modularized, added wires