modified to use fish