DASH-112 & DASH-44 & DASH-113

also move initTable out of controller