Add logic to signature fields
Add logic to signature fields