improve distribution stuffs