Improved random mode