adding table
Several changes