Updated check/uncheck functionality