Continuing generalization of code...