worked class changeover through the entire Core