Table added and some changes