Updated for 1.8 (new doors)