mcdivitt: add support