replace AIC and holder with inner class