New reference state calculations seem to work fine and employ fewer calls to property functions