move more sig functions to common code