added some changes like Table