improved class benchmark