change to explicit table