checks for None added in some places