Work on a newer-ish design