modified to work with the Beta 5 DMG