add some more commonization.