More work on checkbox