Added couple conditional items