reverted changes, fixed _tables