Lots of zsh changes