2nd stage in modularising