More progress in Conor.v