Removed tables and replaced with lists