Revert "Revert "check box ing...""

This reverts commit e03fc2e0ea8410227c66a33f47ada46ccdbfc639.