replaced this with class