reworte to new case style