v5.6

logic optimization