introduce class
fix problem