Make the initial version work again