changed to use common class