changed static only class format