Further split up duck state