added command line args
fixed conflict