finalized both common and # in common files