modify more function signatures