removed dependency on widget