Took into account None being a parameter