added ability to switch between default and random