Minor changes, preparing for checkbox selection
Finished keep selection