Made some comments v12