Converted to checklist syntax; added existing controls