Fish functions added