added filling the tables