Adding proper command-line flags!