changes that seemed ok - but needs 2 grub tries