Almost make it work again