moved the conditional out of the signature method