Applied new logic from Aug 19