New model seems coherent now