More logic refining