fishing system refactored