Updated how options are checked