Updated if statements for extended options.