Updating logic checks per PR comments.