added option to enable the shuffle