Moved functions to class 2.