3 new table and ready to refactor