try to change to the new widget structure