Finally something I think (again) that works.