added missing parts of 2-2