updated for class active