Change to just widget code.