add logic and 2