implemented new bricoleur structure