Updated for 1.8.4.3