Updated main.zsh