Moved to class.

Moved to class.