Updated for ver 4.2 rev 2049