fixing function signatures