take location origin dinamicaly
added tables
added tables