added conditionals if no options have been set