Added small getopt segment