merge between flack & master- added table js