Modifications to support new 'tabled' idea
Added notes