wip/xtrlock/patches
