Update for working with fish shell