Fix global variable
Fix hard coded line number
Add extra arguments if needed