Changed class decl