More pogress on generalizing code