Refine fish model and make some