#190 Implemented scheme for distribution