fixed bug and change Table name