Adjusted definition for mounted vs mounted & on-vehicle