Fitting my old code to recent changes.