Added new table and made some modifications to annotations. System still don't work...