merged with the orig. plugin v.1.3