Make the proof of concept work again