changed to define by class

Teak made me do it.