WIDGET-809: less code + way easier to understand + better showcase