Added possibility to use z