Switched to table and added error handling