Modify for working with fish shell