Change function to macro. Add another command line argument.