fix shuffle and add resources