Restructured for Zsh