Updated all with comments