Updated all code