Update Habanero MRW from Ben Mashak's tree