fixed POD: added shuffle option