Expanded, updated