CheckListener buggy, see if it'll work anyway, incorporating now