on going for 2nd widget
Merge remote-tracking branch 'origin/master'