added shuffle | removed comments