Updated all code to new format