added extra data conditions