updating to handle new options names