updates for removing None