refactored new fish and find current user