Table updates correctly. Will finish graph tomorrow