Better with the class