Lot of changes for signing