Added requested feature, needs a toggle