Updating to match UX PDF - Fixes #406