Changes to accomodate grub also