Adding changes to take command line arguments