Updated all the code