[TW158] - More hacks around Shadowmeld