tomconte Revert to three-valuess format