Changed some function signatures.