More checklist work