added more tables
added disability