Updated to use GRUB2