Add table logic
Add note
Fix merge conflicts