Really added shuffle this time