Revised codes to include only ones supported by Microsoft & Google & with the same code