restructure -- second try