made a little more fit for distribution