Signature 2.0

Refine