Updated user inputted options to work correctly.