Replaced Random with shuffle and pop baby