Added fishing & renamed 1 method