More robust, and distrib now an option