Add the important parts of goldberg back to fix menus