Added Edric's new widget code