Added q to z