moving from define to class