Changed ``z`` to an optional argument in the methods that have it.