Issue #12: restore full lineup