split handlers out