Updated all code to latest version