Added fish. Samba with more options