Why changed to exclude None?