Made shuffle more random