I propose going from 5 rookie rounds to 8, and changing the free agent draft from 8 to 10 rounds. Rosters would be cut to 30 after the rookie draft, and would have a new 40 man limit.

For the years where there's not enough rookies for 8 full rounds, we'd draft 7 rounds in rookie and add an additional (i.e. 11 instead of 10) FA draft round.