enhance distribution process a little bit