More work on checkbox issue