Port from command line
removed dummy func