More work on signatures.