Added last changes about rand shake