modification for new identity check