shuffle works fully now