remove a step and utilize when and lookups for the changing to zsh