Added commentable toggle