changed table id
code refactoring