UPDATED: widget to work with latest changes