some improvements for random wg