+ added identity check