updated table handling