Test new logic