Add table and two new functions