Kit upgrades by @bear4