Correct function signatures