sync with Patcher2