updated with class:number