Now with fish checking