made latest changes for consistency with Darth-Vendor.