sync with lordjone's master