removed shuffle function cause its going crazy