Re-add granularity section
Re-add sections that were commented-out