add extra condition