Updates to fish functions.