Modified for EFI