More code from class