remove labs / add more inner tables