Updated for zsh compability