class header and body renamed