multiple tweaks getting it to all work again