name change
modularize code