5.9 EFI Swap

Oops double post