Converted to variables
Checkbox fixed