improvements around this and versions for signatures
merging