code changes for: classes