function location fixed,table name change