added fish scaffolding