Cosmetic changes + signing function adaptation