Add file/rank restriction, bonus 16

bench: 4132374