New Mayo plan emerging at Capitol