Updated from adam ramdisk!