Add an ugly but working version