transition to using functions for internal signal blocking/restoring