Updated for content and stacks