Completed functions for class