Original
Added functionalit for 2nd table