Mods to work with Wenchao