Reverted to ddevaal/ideal v3support branch