Update
Changed
Added Checkbox
merge logan with master