more clumsy moduleization