Re-added -z option and extended demand() function to use it