merge with lordjone's master