Fork of mdr's plugin