added extra condition