Added checkbox
Added flag