added classonly flag