Table Generation Fixed