Updated for newest 4.3_r3.1..